From e667f0491207c90eddf5f7400f99ec4349f10a24 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Wed, 1 Nov 2000 23:56:18 +0000 Subject: [PATCH] Test set_markup_with_accel() 2000-11-01 Havoc Pennington * gtk/testgtk.c (create_labels): Test set_markup_with_accel() * gtk/gtklabel.c (set_markup): Convert the unichar to a GDK keyval before returning it. --- ChangeLog | 9 ++++++++- ChangeLog.pre-2-0 | 9 ++++++++- ChangeLog.pre-2-10 | 9 ++++++++- ChangeLog.pre-2-2 | 9 ++++++++- ChangeLog.pre-2-4 | 9 ++++++++- ChangeLog.pre-2-6 | 9 ++++++++- ChangeLog.pre-2-8 | 9 ++++++++- gtk/gtklabel.c | 2 +- gtk/testgtk.c | 39 ++++++++++++++++++++++++--------------- tests/testgtk.c | 39 ++++++++++++++++++++++++--------------- 10 files changed, 105 insertions(+), 38 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ae227850d..99952b29ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,15 @@ +2000-11-01 Havoc Pennington + + * gtk/testgtk.c (create_labels): Test set_markup_with_accel() + + * gtk/gtklabel.c (set_markup): Convert the unichar to a GDK keyval + before returning it. + 2000-11-01 Havoc Pennington * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable_alpha): Clip the rectangle to be rendered to the drawable, since - get_from_drawable() requires a region within the drawable + get_from_drawable() requires a region within the drawable 2000-11-01 Havoc Pennington diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9ae227850d..99952b29ad 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,8 +1,15 @@ +2000-11-01 Havoc Pennington + + * gtk/testgtk.c (create_labels): Test set_markup_with_accel() + + * gtk/gtklabel.c (set_markup): Convert the unichar to a GDK keyval + before returning it. + 2000-11-01 Havoc Pennington * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable_alpha): Clip the rectangle to be rendered to the drawable, since - get_from_drawable() requires a region within the drawable + get_from_drawable() requires a region within the drawable 2000-11-01 Havoc Pennington diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9ae227850d..99952b29ad 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,8 +1,15 @@ +2000-11-01 Havoc Pennington + + * gtk/testgtk.c (create_labels): Test set_markup_with_accel() + + * gtk/gtklabel.c (set_markup): Convert the unichar to a GDK keyval + before returning it. + 2000-11-01 Havoc Pennington * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable_alpha): Clip the rectangle to be rendered to the drawable, since - get_from_drawable() requires a region within the drawable + get_from_drawable() requires a region within the drawable 2000-11-01 Havoc Pennington diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9ae227850d..99952b29ad 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,8 +1,15 @@ +2000-11-01 Havoc Pennington + + * gtk/testgtk.c (create_labels): Test set_markup_with_accel() + + * gtk/gtklabel.c (set_markup): Convert the unichar to a GDK keyval + before returning it. + 2000-11-01 Havoc Pennington * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable_alpha): Clip the rectangle to be rendered to the drawable, since - get_from_drawable() requires a region within the drawable + get_from_drawable() requires a region within the drawable 2000-11-01 Havoc Pennington diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9ae227850d..99952b29ad 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,8 +1,15 @@ +2000-11-01 Havoc Pennington + + * gtk/testgtk.c (create_labels): Test set_markup_with_accel() + + * gtk/gtklabel.c (set_markup): Convert the unichar to a GDK keyval + before returning it. + 2000-11-01 Havoc Pennington * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable_alpha): Clip the rectangle to be rendered to the drawable, since - get_from_drawable() requires a region within the drawable + get_from_drawable() requires a region within the drawable 2000-11-01 Havoc Pennington diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9ae227850d..99952b29ad 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,8 +1,15 @@ +2000-11-01 Havoc Pennington + + * gtk/testgtk.c (create_labels): Test set_markup_with_accel() + + * gtk/gtklabel.c (set_markup): Convert the unichar to a GDK keyval + before returning it. + 2000-11-01 Havoc Pennington * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable_alpha): Clip the rectangle to be rendered to the drawable, since - get_from_drawable() requires a region within the drawable + get_from_drawable() requires a region within the drawable 2000-11-01 Havoc Pennington diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9ae227850d..99952b29ad 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,8 +1,15 @@ +2000-11-01 Havoc Pennington + + * gtk/testgtk.c (create_labels): Test set_markup_with_accel() + + * gtk/gtklabel.c (set_markup): Convert the unichar to a GDK keyval + before returning it. + 2000-11-01 Havoc Pennington * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable_alpha): Clip the rectangle to be rendered to the drawable, since - get_from_drawable() requires a region within the drawable + get_from_drawable() requires a region within the drawable 2000-11-01 Havoc Pennington diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 9030d9a600..40f416ce7e 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -285,7 +285,7 @@ set_markup (GtkLabel *label, } if (accel_char != 0) - return gdk_keyval_to_lower (accel_char); + return gdk_keyval_to_lower (gdk_unicode_to_keyval (accel_char)); else return GDK_VoidSymbol; } diff --git a/gtk/testgtk.c b/gtk/testgtk.c index 6f8542535a..2f71a75a13 100644 --- a/gtk/testgtk.c +++ b/gtk/testgtk.c @@ -2002,6 +2002,8 @@ void create_labels (void) if (!window) { + guint keyval; + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_signal_connect (GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), @@ -2091,21 +2093,28 @@ void create_labels (void) frame = gtk_frame_new ("Markup label"); label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), - "This label has " - "markup such as " - "Big Italics\n" - "Monospace font\n" - "Underline!\n" - "foo\n" - "Ugly colors\n" - "and nothing on this line,\n" - "or this.\n" - "or this either\n" - "or even on this one\n" - "la la la la la\n" - "but this word is purple\n" - "We like superscript and subscript too"); + /* There's also a gtk_label_set_markup() without accel if you + * don't have an accelerator key + */ + keyval = + gtk_label_set_markup_with_accel (GTK_LABEL (label), + "This label has " + "markup _such as " + "Big Italics\n" + "Monospace font\n" + "Underline!\n" + "foo\n" + "Ugly colors\n" + "and nothing on this line,\n" + "or this.\n" + "or this either\n" + "or even on this one\n" + "la la la la la\n" + "but this _word is purple\n" + "We like superscript and subscript too"); + + g_return_if_fail (keyval != GDK_s); + gtk_container_add (GTK_CONTAINER (frame), label); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); diff --git a/tests/testgtk.c b/tests/testgtk.c index 6f8542535a..2f71a75a13 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -2002,6 +2002,8 @@ void create_labels (void) if (!window) { + guint keyval; + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_signal_connect (GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), @@ -2091,21 +2093,28 @@ void create_labels (void) frame = gtk_frame_new ("Markup label"); label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), - "This label has " - "markup such as " - "Big Italics\n" - "Monospace font\n" - "Underline!\n" - "foo\n" - "Ugly colors\n" - "and nothing on this line,\n" - "or this.\n" - "or this either\n" - "or even on this one\n" - "la la la la la\n" - "but this word is purple\n" - "We like superscript and subscript too"); + /* There's also a gtk_label_set_markup() without accel if you + * don't have an accelerator key + */ + keyval = + gtk_label_set_markup_with_accel (GTK_LABEL (label), + "This label has " + "markup _such as " + "Big Italics\n" + "Monospace font\n" + "Underline!\n" + "foo\n" + "Ugly colors\n" + "and nothing on this line,\n" + "or this.\n" + "or this either\n" + "or even on this one\n" + "la la la la la\n" + "but this _word is purple\n" + "We like superscript and subscript too"); + + g_return_if_fail (keyval != GDK_s); + gtk_container_add (GTK_CONTAINER (frame), label); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); -- 2.30.2